Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 23:38:14 +0000 (16:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 23:38:14 +0000 (16:38 -0700)
commit75200c366f3223f1cd1462eb265e5e20858f1c7e
tree8d85949647e09e24912c8ed16fe95b6e3146fc78
parenteba0dba38cd0dce5cf3de5a31c8f3882161e213b
parent892e7c62bcb294c4719aa920eb6f112fb141c5f7
Merge from trunk.